Fix for anonumouse use