More work on fixing #19
Potential #19