Bug fixed - v1.1