Fixing damn bug