Bug fix for very long syntax