Added disabled check