Fix #417