fixing some madness