trying to make it work with new active_support