improved my bugfix :>