Fix recent issue - now finally