Implemented jscrivner's suggestion.