Verify #94 is no longer an issue