Fix for null params.args
Rebuilds