a littile bit fix