Fix #385