Fixes #27
Should fix #28