this is needed until a better solution is found