fix issue shomare 25