class fix for Jon