Bug fix for 'it doesn't work' from andy
Bug fix for 'it doesn't work' from andy