is this any better ? fix that bug