possibly fix issue 308