Should fix issue