Forget to commit this

Should fix both #90 & #91,