Fixed always available bug