Fixed bug reported and implemented suggestion made by SCG