Fices issue #1 as proposed by droidinteractive