Bug fix – now works!