I think this solution is masking the real problem. If more proper solution is matter of short time (~1 hour) I would go for it, otherwise at least please put a TODO here.