Bug fixed

Bug fixed for first release