work for 3.3.0, fixes #41