Bugfix/old rubies

continuation of #509 with proper target branch