This might fix the backwards compatability problems.

Signed-off-by: Lucas Arnström <lucasarnstrom@gmail.com>