(x) Fixed issue where non-generic method would be weaved as generic method