Fix dependency on mochify
add compatibility