Fixed #416

Another way to skin the cat