fix this-handling