some fixes on the actual version 0.18.8