Fixes partially #73