Hot fix for version v1.5