Minor modification to work with Freestyle.