Fixed failing spec after rebase