Fix #84

No tests as yet; no point as I've got no hardware to test it with :)