fixes #1557 ...again...