Added workaround for multiple line issue