Simplifying the bug fix as suggested by cfbsoftware. Refs: #13.
No need for additional procedures.