Further fixes #30