Fix #383