This is required to correct #13. You might want to pull that into master as well