Dirty solution to dirty bug