replaced the just committed hack with another possible better solution