Fixed #436 and fixed #441