remove IS_LOADED check as it is buggy