Rework fix to address comments by BevapDin.