Prevent potential regressions

References #95.