Well I think Stefan's solution is more correct and will not break anything.