Fix #519

xref #519