Old bug re-fixed