fix version 2 (complete)