Fixes #1579