Attempt to fix fadein caused problems