hotfix for unsafe operations