[fix] Maruku chokes on more things now