WIP: Bug fixing
Add screen shot