Bugfix regarding GCC (shadowed template parameter)