Issue #34: trying to make things a bit faster