Added final bug fix. No more bugs are found.