Fixes / 0.3.48-SNAPSHOT