Fix #25

Will open a different issue for further work