bugfix + added availability