Fix #495