Revert "Revert "Commit fix resources byg""

This reverts commit e1ae3284e0bd8b14710a857a2ad9d696731ba92c.
fix critical bug