Fix #96 - annoying