Fixed #366