Picking up flags works correctly now