Fixed seg fault error -______-