fix shenanigans