Comment and fix port