Fixed for rails best practices