Issue #326:
- Added missing modifications regarding to previous modification introduced in commit
  a7b3a725b316fb387a268c5f411cb2b9f4f953e0.