Fix #329