now fixing it for reals