Fixed #429, Fixed #281