fixed for poe_rails
Merge remote-tracking branch 'snowsunny/master'