Fix3199

fixes 3199, 3200 and 3201 which are in fact one