fix it properly