make somewhat less buggy