Fix #420 also for master