Small bug fix - flag parsing missing