fixed issues with conflicting method names in newer versions of rails