Attempt at fixing Papertrail