Closes: http://openhatch.org/bugs/issue916

Closes: http://openhatch.org/bugs/issue916