|#885 | Fixing build