Fix #1485 properly