Fixing ISSUE#35