Made hack-wish work properly.