Quick fix, needs to be properly fixed