Fixing andrew's attempted bugfix...