A toggle option for this feature would be nice