Another quick fix for sytax mishandling