Rockefeller, fixes #503