Dealt with issue #47