One more step closer to rails 4 compatibility