Removed double check, and swap dependencies order.