Added fix to 94902445f7b51d6a6ebff481385be288cf03d208