2011-03-15 moel.mich Fixed Issue 161.