(#3251) - WIP - fix with stupid solution