More fixed for #119