DEVINT#16
Bug fixed.