Fix #66 thanks to @gcox