Bug fix #280