Fix Issue#43