Bug correction (thanks Mathias)