Fixed dependency on commentcontainer from user side