Fixed #337