fixes #1579