Small optimization for issue #14