Fix issue with activities_controller