#9 fix signature, #2 fix method