Removed Seg fault