## Bug fix in core.rb