MAVEN-68

Hey @mikakoivisto

Here is the commit: abdd49ee50fe8bc1085a1f9a66c7e5808626bed0

This fix is a bit of a hack, let me know if there is a better way to fix this and I can try to update it and send another pull.