Dirty fix for weird bug