fixed to work with current wallbase.cc