ISS 3: Fix Bugs