dev 4 - Bug resolved