Resolve issus #5.