fixed unsafe hack