Changing parameter order due to backwards compatibility issue