Fixed #52