Fix #336