Fixed null pointer exception :<