Version 4.0.1 ready fix #45