fix for regression in #2009