Fix for #417
Fixing merge conflict.