Fixes for Guard again

Fixes @options holding the merged values from previous calls to