[#020] Fixing second part of a bug