tmp fix, can do better