Issue#370 borrowed until

resolves #370
resolves #371