issues #319 #327 #358 #360