Bug fix #268