Dev

This line should be outside if loop. So that line 60 can be removed.