Issue #28: Back in the saddle