Fixed #4 -- Potential fix, optimizes the first parameter.

Still needs testing of real world code