fixed version, not sure wether it's a good solution