Fixed handling errors
Fixed mass tag