fix for decl/assignment differentiation issue