These 2 lines are a bit hacky and will only work in production - is there a better way to achieve this?