Partial fix and workaround for #11
restructuring