Fix Build
Fix #256
First steps to fix #251