Fix issue 41, 45.