Fixed Issue#12