More elegant fix with message