Fix for 1.3.x branch

See #3088