Fix #3004