Last fix for the version 0.5.0.1