Issue #498 Resolving errors