Some more changes on the issue @bb43784

Some more changes on the issue @bb43784