Address issue #422

Another stab at issue #422