[fix] make @mmalecki a happy camper
merge with @cronopio