Additional bug fix BAAS-410