Resolve issue 176