Fixed #006