Slightly optimized handler