this probably fixes one of the open issues