Stupid bug fixing