Partial fix to #195, added not implemented flag check