Fix #292 part3