Fix #314

no code review pls