Fixed #88. Fixed #87