jesus farking christ, refs #1016 and fixes fdd54b71d63af6617e3abf4d452fdd322f35b3e2