Fixed to support all current examples correctly.