Changed handling of non-Hash input