Fixed #4, Fixed #392