jesus farking christ, refs #1103 and fixes 8c40316ee1b2ec7b641be422e960571be27e3bcd