updated as per issue 212