Tim bugfix