Fixing DAMN bug