Fixed barfing.