Added hacked in functionality to get the desired behavior