Just impelmented a hacky fix, needs work