Tried to fix bug