FIX: Replaced masking options with using np.nan and the  clearing and filling again