Fix #1392

This commit is really it