Fixed #15 Wrap state is not respected on start