Basic bug fix in release branch