fixed up fatal bug