Side bug partially fix