fixes for version 4.3.0.37