Provisional fix of Drop-in behavior.

Working, still hacky though.