Fix for Tom's solution