My solution: on the Forums
Had the same problem, this fixed it and probably is safe/extendable for the furure.