partial fix for order of operations (COMMA)