Further fixes for Issue#16