fix for 336