Temporary solution proposal to #29 and #81