Fix #487: 2nd part