Fix for 7 params