Fixed issue 54