Clean up issue with work done on #94