Minor improvement to loaded-check