Fix #434