Fixing cbpaste