Revert "Small code simplification"

This reverts commit 62ad74c298679227663ae09f48182b778fca57eb.
Bump Version