Fix Issue#48