Partial work around for error message issue