fix order of operations
1.0.1