Better (not perfect) ghost fix