Fix #323