Fix #337