Revert to old synthax and fix old and new bug