We really need a better solution :disappointed: