Fixed failing test related to commit #81