Fix for current obs