Potentially resolve #811