Tried to fix bug, no success...