Working around HUE-1097
Trying out some stuff