Added second version of the hack