next fix for workaround for strange bug