first idea of a maintenance helper to resolve issue #31