Bug Fix and packaged as a gem