Fix always available bug