Bug fix for walter