Fix #1905

See #1905