Fixing the workaround :)