Yes it is @soul2zimate - but as the FIXME above says, these should be sorted out in #62