Closes issue 269