cleaned up a bit to account for pending bug #281