prevents #1349 regression