Fix broken argument order, don't block arbitrarily