possible workaround issue commet #51 - nicer way in next revision