[#53] Fixing something