Fixes #5; MNAR will have to wait