Fixing hack