improving workaround