bug fixed by emirraz