Hack to get working on monolith