Fixing the multi-line case