05271509_fix issue