Finished Bug fix