Fixed #305