Fixed #314