Fixed Issue#83