Fixes #1602