Fixed #336