Sort of fix #123, more of a stopgap really