stop using latches again :(