Credit #103 fix.