Fix #450