no longer needed with fix to #35