Hacky cookie fix