more improvements/bugfix for pass through buttons