Made a quick hack to solve a problem