fixes #1504