some very small but annoying refactor