%include support; bugfix