Potentially a better approach for dealing with #31