Added the 'workaround' to comment errors