Quickhack fix