Should be final bug fix for a while.