Fix #161 & last compile