Bugfix: use correct variable
Refactor: refactor my helper method to be able to re-use it
Enhancement: use new library helper
Enhancement: wrap this into an additional check