Reverted to test fix which actually did something positive