Fixes bug with method returns