Fixed build from broken merge. Please run specs before pushing