Bug Fix and security update