Recompile after merging #18