Fix #343