Resolved the problem with a teporary solution