Ugly work around for the time being