Further fixes #1114