fixed bug, renamed method