Fix for static method too
3 files changed