this seems to be the solution we're looking for

Signed-off-by: Cristian Stoica <crististm@gmail.com>