Add fix for error, though it does not solve the underlying cause