added bootstrap workaround