Have a fix but it might not be the proper solution =/