rough leonardo support - does not seem to work