Fixed #285 Fixed #293