Fix #455