Quick fix for remaining GUI-61 issue