Dirrrrty way of fixing signature