fix to pass all specs