Fix build err (#152)

Fix for #152 and for #159