This Fixes #900: Again fixing merge issue