Hacky but solved the problem