Fix for the multi-line command issue