Fix #330