bug workaround. tim?