Fixed #913 and #914

There. As blunt as it gets.