Fix #328