Add workaround for a bug (need proper fix)