Just to remove an irrelevant error until this is rewritten - TODO: Fix this