Fixed more umasking issues... have to use strings