Better fix of #18