small change for more robust logic