Fix conditional, replace static method to Misc