diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index b080aa6b5f0..c143c44c594 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -69,10 +69,6 @@ extern "C" {
 #ifndef M_LN10
 #define M_LN10          2.30258509299404568402
 #endif
-#ifndef NAN
-static const unsigned long __qnan__ = 0x7fc00000UL;
-#define NAN                 ((const float) __qnan__)
-#endif
 
 #ifndef sqrtf
 #define sqrtf(a) ((float)sqrt(a))
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 31df55b6818..ddf838f2535 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2401,17 +2401,14 @@ static int screen_animation_step(bContext *C, wmOperator *op, wmEvent *event)
 		ScreenAnimData *sad= wt->customdata;
 		ScrArea *sa;
 		int sync;
-		float time = NAN;
+		float time;
 
 		/* sync, don't sync, or follow scene setting */
 		if(sad->flag & ANIMPLAY_FLAG_SYNC) sync= 1;
 		else if(sad->flag & ANIMPLAY_FLAG_NO_SYNC) sync= 0;
 		else sync= (scene->flag & SCE_FRAME_DROP);
 		
-		if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE))
-			time = sound_sync_scene(scene);
-
-		if(finite(time))
+		if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE) && finite(time = sound_sync_scene(scene)))
 			scene->r.cfra = floor(time * FPS);
 		else
 		{