lk_1299: update to be compatible with rails 4.1