Fix for 1st bug

Fix for 1st bug