Hack solution fixed