Refactoring
Fixed incorrect parameter usage