Fixed #456 fixed #457 and fixed #208