|#907 | Fixing build