#162 - reversing changes on an earlier fix to completely accomodate this issue