Addresses some issues with GH #124