finally fucking fixed