fixing this nonsense