Fix Issue#12