Changes to comply with main repository PR #54