Fix entry issue