Bug fixed

First merge fix