Implemented suggestion #4

Implemented suggestion #4