Bug Fix
Bug fix in shelling