Added fix as suggested by @clinton-hall