Still tyring to fix bug