Fixed issue 2013
Fixed new issue