#1 fixs the bug