Fix ATEAM-767

Michele Rendarequested to merge
mrenda/athena:fix-ATEAM-767 into master

Hotfix for a regression introduced with previous merge request by ATEAM-767

Edited by Frank Winklmeier

Merge request reports