TMSS-139: Closes TMSS-139 see: https://support.astron.nl/jira/browse/TMSS-139?focusedCommentId=26169&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-26169