Fix for Ruby > 1.8