Fix #466