Fixed WiP parse