Fixed explicit case.  Seems to be working, but haven't verified results yet.