Fixed #253 Fixed #254 Fixed #255