Added proposed fix for issue demostrated by test