Fix #1642