fixed bugs introduced into stfu