HV-907

It's just a bit shorter :) Added a commit for this and merged. Thx!