Fix #436