Work around the empty line bug again