Fix for Gacela error on dev branch