stuff to make it play nice for now