changed to work with version 3.0.3.0