fix citybikes support (adapted from pull req #1450)