another fix (that should work)