fixed gremlin introduced by the fix for #629