Fix for #268