feature/38: Fixing a merge issue