fixed shenanigans