Fix for Issue-005