Fixed #445 and fixed #443