This would help prevent regression on #80
This would help prevent regression on #80