couple of buglets in previous patch