Changed behavior based on @njx feedback.