[#160] Fixing invalid