bugfix: storing comment files in correct context