Fix #499