Fix ugly buuug