Fixed again; this should really work now