Fixed failing spec due to recent merge