Fix #384