Fixed #345