Fix for #240