handlers fix