Extra fix to ensure its state