This fixes #1105