Fixes acc. to the advice of intelfx