Quick parsing fix #2