Slightly reduced the scope of hack.