Fix for activerecord
Missed one
Bye, bye context
Bye bye context for real