Fixed #48