Comments import fix