Fixed bugs with comment acces