Try to fix issue