Fix PR #102 changes that are cause due to #103