Closes issue 307