fixing some shenanigans