Fixing build. Relates to #1