Attempt to fix flags passing