Hack modification issue #3