Added a tuple; this looks damn ugly