fixed unsafe condition