Fixed #307;