Fixed #1286. Sort of.