fixed faye stuff