properly fixing it this time