Don't like to hack this way, but I want to go fast

Signed-off-by: Martin Richard <martius@martiusweb.net>