Fix issue #1044

This PR eliminated the ambiguities described in #1044.