It would be nice to have this as an option too!