Fix bug #438 , #439