Additional fix related to refactoring done by @spacebat in #9.