yet another error. May be I should move off the hacks to another branch?