Fix #396