a great commit that should solve #251