fix for Tom