Fix #458