Fix #934, though Gavin might not like it