Fix for Issue #86

Replacing 'for..in' loop with regular 'for' loop.