Drop #981298 by @ikertje